Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 17:13:29 +0000 (10:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 29 Aug 2011 17:13:29 +0000 (10:13 -0700)
commit46e1d44d6dd2d2b261fa0f8121338b30d98759bb
tree564c10763d18bfbb7c7848f1946fda97ec6ec1ea
parentb49403b0d7c347e17b29b5b73c175896d42f3c64
parentf453bc6242101b6b2c89c86c9bf7476f7a159a40
Merge from trunk.